configure.ac: Bump GLib requirement to 2.40

Mainly for GVariantDict, useful for metadata.

diff --git a/Makefile.am b/Makefile.am
index c2190c920df0de74d5dff8ec7b471300895dd405..b5b43d6e0d6b22bd853026d89ca8c31ecf8aa0ef 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -22,7 +22,7 @@ AM_CPPFLAGS += -DDATADIR='"$(datadir)"' -DLIBEXECDIR='"$(libexecdir)"' \
        -DLOCALEDIR=\"$(datadir)/locale\" -DSYSCONFDIR=\"$(sysconfdir)\" \
        -DGPGVPATH=\"$(GPGVPATH)\" \
        -DOSTREE_FEATURES='"$(OSTREE_FEATURES)"' \
-       -DGLIB_VERSION_MIN_REQUIRED=GLIB_VERSION_2_36 -DGLIB_VERSION_MAX_ALLOWED=GLIB_VERSION_2_36 \
+       -DGLIB_VERSION_MIN_REQUIRED=GLIB_VERSION_2_40 -DGLIB_VERSION_MAX_ALLOWED=GLIB_VERSION_2_40 \
        -DSOUP_VERSION_MIN_REQUIRED=SOUP_VERSION_2_40 -DSOUP_VERSION_MAX_ALLOWED=SOUP_VERSION_2_48
 AM_CFLAGS += $(WARN_CFLAGS)
 DISTCHECK_CONFIGURE_FLAGS += --enable-gtk-doc --disable-maintainer-mode

diff --git a/configure.ac b/configure.ac
index f6aeb019ce89d16a14dc9bc2007e8c953a7f0be5..180950fb1782570e2713dc7b50538796c6645d1c 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -43,7 +43,7 @@ AC_CHECK_HEADER([attr/xattr.h],,[AC_MSG_ERROR([You must have attr/xattr.h from l
 
 PKG_PROG_PKG_CONFIG
 
-GIO_DEPENDENCY="gio-unix-2.0 >= 2.36.0 libgsystem >= 2015.1"
+GIO_DEPENDENCY="gio-unix-2.0 >= 2.40.0 libgsystem >= 2015.1"
 PKG_CHECK_MODULES(OT_DEP_GIO_UNIX, $GIO_DEPENDENCY)
 
 dnl 5.1.0 is an arbitrary version here

diff --git a/src/libotutil/ot-variant-utils.c b/src/libotutil/ot-variant-utils.c
index 7aa427454ddec77d5840b716b2a4f5f0e4c8c9a4..fab893e6005a41fc7aa155b45304531e6709a611 100644 (file)
--- a/src/libotutil/ot-variant-utils.c
+++ b/src/libotutil/ot-variant-utils.c
@@ -280,15 +280,7 @@ ot_variant_new_from_bytes (const GVariantType  *type,
                            GBytes        *bytes,
                            gboolean       trusted)
 {
-#if GLIB_VERSION_MIN_REQUIRED >= GLIB_VERSION_2_36
   return g_variant_new_from_bytes (type, bytes, trusted);
-#else
-  gsize size;
-  gconstpointer data = g_bytes_get_data (bytes, &size);
-  g_bytes_ref (bytes);
-  return g_variant_new_from_data (type, data, size, trusted,
-                                  (GDestroyNotify)g_bytes_unref, bytes);
-#endif
 }
 
 /**